Introduce XEN_IA64_DOM0_NON_VP to simplify some ifdefs

from defined(__ia64__) && !defined(CONFIG_XEN_IA64_DOM0_VP)
to defined(XEN_IA64_DOM0_NON_VP).

Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp>

diff --git a/linux-2.6-xen-sparse/arch/ia64/Kconfig b/linux-2.6-xen-sparse/arch/ia64/Kconfig
index 13df89f457fe0ce52386225cbd2c459e1d4d994b..9dfbec6db3a6ed857e9d4d1a9cded0d7215c44c7 100644 (file)
--- a/linux-2.6-xen-sparse/arch/ia64/Kconfig
+++ b/linux-2.6-xen-sparse/arch/ia64/Kconfig
@@ -90,12 +90,19 @@ config XEN_BLKDEV_BACKEND
        default y
 
 config XEN_IA64_DOM0_VP
+       bool "dom0 vp model"
        depends on XEN
-       bool
        default n
        help
          dom0 vp model
 
+config XEN_IA64_DOM0_NON_VP
+       bool
+       depends on !(XEN && XEN_IA64_DOM0_VP)
+       default y
+       help
+         dom0 P=M model
+
 config XEN_SYSFS
        bool "Export Xen attributes in sysfs"
        depends on XEN && SYSFS

diff --git a/linux-2.6-xen-sparse/drivers/xen/blkback/blkback.c b/linux-2.6-xen-sparse/drivers/xen/blkback/blkback.c
index 8ed82df72369e9560f22a5ce4883e770e35bd1fc..48be015532009f4a6e8fe0cd258868df7a31ee34 100644 (file)
--- a/linux-2.6-xen-sparse/drivers/xen/blkback/blkback.c
+++ b/linux-2.6-xen-sparse/drivers/xen/blkback/blkback.c
@@ -410,7 +410,7 @@ static void dispatch_rw_block_io(blkif_t *blkif,
                }
 
                pending_handle(pending_req, i) = map[i].handle;
-#if defined(__ia64__) && !defined(CONFIG_XEN_IA64_DOM0_VP)
+#ifdef CONFIG_XEN_IA64_DOM0_NON_VP
                pending_vaddrs[vaddr_pagenr(pending_req, i)] =
                        (unsigned long)gnttab_map_vaddr(map[i]);
 #else
@@ -546,7 +546,7 @@ static int __init blkif_init(void)
 
        blkif_interface_init();
        
-#if defined(__ia64__) && !defined(CONFIG_XEN_IA64_DOM0_VP)
+#ifdef CONFIG_XEN_IA64_DOM0_NON_VP
        extern unsigned long alloc_empty_foreign_map_page_range(
                unsigned long pages);
        mmap_vstart = (unsigned long)

diff --git a/linux-2.6-xen-sparse/drivers/xen/blkback/interface.c b/linux-2.6-xen-sparse/drivers/xen/blkback/interface.c
index 15ff3d1b5aefa53fa2d31f75a3430409f9482dcf..cc5c6b5930a0cbd5f9f9951b637e0ea13751bdcc 100644 (file)
--- a/linux-2.6-xen-sparse/drivers/xen/blkback/interface.c
+++ b/linux-2.6-xen-sparse/drivers/xen/blkback/interface.c
@@ -74,7 +74,7 @@ static int map_frontend_page(blkif_t *blkif, unsigned long shared_page)
        blkif->shmem_ref = shared_page;
        blkif->shmem_handle = op.handle;
 
-#if defined(__ia64__) && !defined(CONFIG_XEN_IA64_DOM0_VP)
+#ifdef CONFIG_XEN_IA64_DOM0_NON_VP
        /* on some arch's, map_grant_ref behaves like mmap, in that the
         * passed address is a hint and a different address may be returned */
        blkif->blk_ring_area->addr = gnttab_map_vaddr(op);

diff --git a/linux-2.6-xen-sparse/lib/Makefile b/linux-2.6-xen-sparse/lib/Makefile
index 44c3323e118a7857842f43cc5fd52f53b04b13d1..2657bb5d10b6a1dc5e91e31fed5c8fddf38bba8a 100644 (file)
--- a/linux-2.6-xen-sparse/lib/Makefile
+++ b/linux-2.6-xen-sparse/lib/Makefile
@@ -45,7 +45,7 @@ obj-$(CONFIG_TEXTSEARCH_BM) += ts_bm.o
 obj-$(CONFIG_TEXTSEARCH_FSM) += ts_fsm.o
 
 obj-$(CONFIG_SWIOTLB) += swiotlb.o
-ifneq ($(CONFIG_IA64)$(CONFIG_XEN_IA64_DOM0_VP),yn)
+ifneq ($(CONFIG_XEN_IA64_DOM0_NON_VP),y)
 swiotlb-$(CONFIG_XEN) := ../arch/i386/kernel/swiotlb.o
 endif